Fix build errors caused by Brooklyn updates