more incremental fixes for #142