Fixed a few issues and more OgrHelpers