Minor fixes required when running in interactive mode.