fixes for using omni and cm source