Customfield fixes