Patch 1 - Small changes

Should be good enough to submit