Fixed small issues from merge