fix few thigs to help batch submission