Fix minor issues from merging