Fix some omni_analyzer problems, and do some misc cleanup