Few fixes in in final script