Fixed issues from merging.