Minor changes to class objects