Update to pick up a number of issues - more to do