More fixes for #98