More small issues...