fixed two more issues