Updates to make compatible with latest ensime-server