-More fixes for #31