Some more nitpicky stuff