JIN-74 + minor things