incremental fixes for #269