Changed some calls to the new getters/setters