Several small input line fixes.