Committing fixes to complex adjustment