Latest patch fails to compile