Some input cleanups