ome master fixes