Some more little fixes