Minor 5.7-wip fixes

Just some minor fixes for things I found while trying to use the alpha (I have my editor set to remove extra whitespace btw, add ?w=1 to view without whitespace changes)