Fixes to support multiple plots on the same page.