Several fFixes