Fix for drift management failure and bundle failure