More OOP fixes.