Debugging messages enhanced.