Small fixes for OOP