Other bug fixes
Merge pull request #18 from ckennedy-nmdp/fix-bugs

Other bug fixes