Final changes made for linux portion of p2.