Fixes to adder