8 Commits (fixes)