caman changes to fix errors