some_fixes