Small fixes per PR review