Additional fixes for #89