more fixes to resource class assembly