Issue 2221: Fixing front-end things