Mark some fields as required f-me/carma#1360