Fix tasks for generating CSR