fix packaging issues