User test fixes.