FX manager fixes