Add eska support and fix some errors