Minor fixes to project packaging