Package fixes

Some small packaging related fixes/updates.