Fix up a few FieldType bugs