Fixes for OMX, Shutdown Bug and so on ...