More fixes for pull #71