fixes for deadlocks and dollars in asm