More fixes for #37