Fixed chart plotting bugs