Fix esb/software