Plot fixes and similar