0.20.05 (Nivve) settlement fixes