Fixed small merge issues.