More fixes, 16