tweak fixes for compile
Merge branch 'master' of https://github.com/ctuong/CS244