we will test and commit if it all works. I think I'm going to try to get the emulator fixed and long term go with that, but these fixes are needed for the emulator too. ron