Late fixes