More fixes for bug #3