Initialization cleanups; debugging helpers