Updated Omnibus 2.0 with minimal metadata fixes