Bring in Adam's changes to my fork