Fixing more build breaks.