Some tweaks to the fees models to make them a little easier to work within in admin