Last mile changes
Fixed dev env