fix few minor issue