Legend fixes