fixes on custom fields