Fix some build failures