Fixed minor issues with plotting