Minor adjustments and bugfix for interactive mode.