add some tiny fix up