Small corrections acc to sugg. from reviewboard