Fixes to things that weren't fixes.