Patches / Logging fixes.