[squash] first attempt to fix compiler errors