Fix stuff from PR comments