More fixed for BetterGFacImpl