Fix excessive messages (again?)