fix some tiny issue