Change some base types