Fixing omnibus build errors.