Minor fixes in already reviewed sections