Fixes issues found by the !5376 (closed) experiment.
Cc: @robertmaynard @allisonvacanti @brad.king @lorensen