Quick plotting fixes