More tweaks for custom pledging. See #244