Minor updates/troubleshooting