Bug fixes
Debugging code