Fix missing keyword arguments
Fix state traces