Some OOP fixes