More tweaks to charity and merchant