2nd pass for various bits missed by auto fixer