Rollup of minor fixes found by Martin Ettl