Improved ogm support + fix typo.