Fixes to accommodate plplot changes