Logging fixes, faster cluster resume