More fixes for #102