Tweaks to ease future releases