Minor fixes to  branch