Few more tweaks leftover from last commit