Minor package infrastructure fix ups.