Fix minor issues to make it compile

~Adam