Fix some retours