Fix spoon me builds?