More tweaks to enable negative values for labels