Fix ResourceLoader infrastructure