Fix bugs 1264236, 1264238, 1264254