contrib fixes from email