jin_prop fixes
jin_sample fixes