Fix some tiny issue