More fixes for #141