fixes for #107