fix some minor issue