More fixes for #85