Small tweaks to attempt to fix breakage
Fix the hardest bug I've ever had to track down!