Add intent lock for batch executor
Make build all work