Fix simple fields for use None