Fixed plotting calls