Make some small changes suggested by kibit (static analysis)