More tweaks from C&P errors