Fix build issues releated to bz1012059