Minor bug fixes to 'noinput' mode.