Fix some returns