Update for moz21