Define package fixes

Fixes by Eric Timmons

Merge request reports

Loading