Incremental fixes for #96