Resolved some merge issues found when unit testing.