OMP fixes for FGT & RAR