Fixes for submission to batch and monitor