Fixes on BatchBundle namespace