fix issues from previous merge