Fix some inconveniences