Fixes on checkout