7 Commits (fixes)