fix some tiny bug