fix 2 more issues