Fixing ESB issues