Few fixes to get Scott's build to work