Minor Changes to Previous Commit

Fixed a couple of issues with the previous commit