Settlement Module fixes