A few small changes to get it working on my machine