Small fixes (OOP, inheritance)