Modify charts to be more robust