Fix a serious regression in 3.2.4 which caused "--add" to often fail. Other minor fixes included. Signed-off-by: NeilBrown <neilb@suse.de>