final_fixes