Patch up some new errors from rustpkg