Fixed a three minor issues with suggested changes

8 jobs for patch-1 in 5 minutes and 50 seconds (queued for 1 second)