Fixed various field types