0.21.07 (Nivve) settlement fixes 2