Refs #6 - Fix small issues.