Tweaks after working with Jim