more fixes for easy dev setup