Add fixes from James visiting