More fixes for bug #916