Page refresh fixes in FX