Minor fixes for exhilarate