Few more utility tweaks