Few last tweaks