Tidying up some small issues from merge