Fixed up type fields