update_october_9_fixes