Fix some packaging issues