couple of fixes in Jiesa