various_fixes
