Some things to hold-over until vendor folder arrives