Cosmetics on validate_csr