Fix ResourceBuilder handling