Shulinye minor fixes