Fixed post-merge issues.