Tweaks to make #308 work