More fixes for #47