Fix settlement creation