various fixes for omnibus 4.0