Various minor improvements

... introduced while testing against larger project (ie Estatio).