OOP: Small fixes