5 Commits (fixes)