More stuff from OMNI

Change-Id: I19ee7c3ba8f0a1ae4ebccc5a96fbdc42af9e762c