Small tweaks to interactive mode handling