Apply Siu's fixes