Debugging Fixes