Updated ASM to v5 and fixed fallout