More fixes to legends