More fixes, 68