Minor updates to emulator and scanner