Minor fixes.
Merge branch 'usage_dev_branch' of ssh://github.com/open-infinity/cmt into usage_dev_branch
Merge branch 'usage_dev_branch' of ssh://github.com/open-infinity/cmt into usage_dev_branch