two small compile/patching fixes