Compatibility Improvements (Checkout Options)