CAW-216: Cleanup fixes