Troubleshooting

Fixing things that aren't working as expected.