Debugging fixes