Minor fixes
Merge pull request #294 from SUNY-Albany-CCI-INF362/master

Minor fixes