Fixes and tweaks to get this working on a new computer