Fix the errors reported by Spuds