issues#next tweaks