Minor fixes, guarantees sanity of add/sub