Fixes for PBR to work