Fix disp-formula issues