Few more slight tweaks