prepare before commit new version
fix package preparation issues