Fix several packaging issues

Edited by Eric Long

Merge request reports

Loading