Fixed some minor issues identified by compiling with master branch of Chicken.