More fixes for #205