some fixes related to packaging  please review it