Some more things I spotted

please review