Tweaks to make John happier