Final fixes, as per Linh's suggestions