Fixing some issue for making package