Tweaks to shield generators

See commit log for more details.