Fix batch types

Close #64