More jshimt fixes