QFE fixes applied