Fixed condipack issues