[minor] even more tweaks