Small Fixes

Small fixes to address two issues. Further details for each are within the actual commit.