Fixes for Diners Club