Fix build errors from previous commit

(hopefully)