Few more final updates