Fix some more issues
Merge branch 'ampcamp5' of https://github.com/amplab/training into ampcamp5