Fix some forgotten stuff from batch task namespace change