Changed some field types