Patient Class Bug Fixes