More input fixes