Update to latest and fix elasticsearch