Fixed issues from merge