Minor fixes to resource models