Fixed multiple minor issues.
Merge branch 'master' of https://github.com/OpenDSA/OpenDSA