Collection of minor fixes