Fixing some checkout stuff