Fixed more OO issues