No shortcut for disco, other front-end fixes