fixed two issues