I'll open dedicated tickets for specific fixes later as needed