More fixes for #121