contrib fixes