More fixes for #193