various omx fixes

Change-Id: Ie74a5cfc48501de2a37d486c12065a0f90b6a745