fix 2 issues