Troubleshooting

Resolve some issues