Additional fixes for #193