Changes that made it work on my machine.