Troubleshooting

Fixes for what goes wrong on a Sunday.