fix few minor issues