Fix messages ordering and limit