Debugging and messenger fix.