Re: miscellaneous patches for rpkg