- set of minor fixes