Final changes to hadoop