Fix build errors under ß7