Small fixes while reading