Fixed some issues with CE plotting.