Constants corrected after type changes