Exardly container fixes