Fix build error (Part 1)