Changes to make it work on Feds Mac