Fix GEM separation
Fixed FPP builder loop bug