settlement build bugfixes