Fix build breaks