Initial changes to get it working on my system.