Minor fixes discoverd while doing other things