Deal Option changes/fixes