More fixes for #20