More rustpkg fixes