Changes to break @lloydwatkin's builds