More fixes, 56