Some more minor changes to fix what I pushed last time