More input fixes.