Debugging fixes.