Update suffix and multiple mode fixes