Make some changes to the setup tasks as suggested by Badri