SWORD25: Further fixes for Amiga compilation