Some more fixes for aasm.c