Fixed a couple of minor issues from last commit