More fixes, 47