0.21.04 (Nivve) Settlement fixes