Hopefully final batch of changes for v1 CN