Various plotting fixes