Fixed some plotting issues