Fix batch dependencies