Tweaks on jmd2