Some fFixes