Quick menu handling fixes.