Minor adds and conf changes