Fixing build breaks