Slight modifications to plotting routines

Not much to see here, just some changes due to plotting stuff...