Few last final tweaks