Fix some more comments