Fix issues brought up in PR review
Fix more issues