Fixing build breaks, finally.