Minor changes to get it working on my machine.