Add client security hacks + improve lazy CL init, for time being