Update to be more compatible with rustpkg