Fixed nitpicks