Fix some inconvenience