* Solve packaging issues