fixes for interactive mode