- Fixed issues after merging.