More fixes to scene2desc task.