Apply these in addition to Matt's patches.