Fixed compilation errors because of UnitConstants