Fixes on interactive mode