Use patches that work on Keymaker