fix issues from looking at diff