[Section 1] Minor fixes