More work on the emulator libs.