Fixed errors produced by menu/develop merge.