Troubleshooting through some bugs