More fixes for #244