Some minor improvement