minor fixes by Thy