A few chart improvements