Runtime and logging fix.