Fixing more of my asm screw ups.