Fixing some minor nitpicks