Fixes for interactive mode.