More fixes according to PR comments