Jshing fixes and build