US2: Minor fixes