Further Fixes for input