Fixes for #95