Some tweaks and troubleshooting information