Minor improvements in Classes and Inheritance