Fixed possible checkout issues.