Fix in base types