Classes and objects small fixes