James's tweaks from debugging on hardware