Updates to fix easy dev setup