More changes to make old code work with new OS