Fix build/test breakage