2 Commits (various_fixes)