Few last minute tweaks