Code: Minor fixes.
Merge pull request #463 from am11/master

Code: Minor fixes