More fixes on the hung song