6 Commits (fixes)