r12206: Fix some issues in NOEMIT