Small changes fixes to all classes