fix 2 issues after merge