Fixed some build breaks introduced in the last commit.