Date check for cancel order and others minnor fixes