Fix some compiler breakage after rebase
fix broken tests after rebase