The Squeal of the Pig: Minor Patch

Minor bug fixes