More fixes for #35