Fixed FX related issues.