Fixed issues from the merge