Tweaks on messages and debugging.