Minor changes during troubleshooting.