Removed warning.
Adjustments for interactive mode.