Fix build breaks caused by const and transforms