Fix small code issues from last commit, refs #124