More fixes for #4