More CoC tweaks