Some minor nitpicks/fixes.