miscellaneous patches for rpkg