7 Commits (amiga-fix)