Fixed some plotting