More OOP fixing.