Rest fixes
csr_object fixes