Fix crash due to the change in %clay storage model
Fix revision origin.