More sizeof() replacements, adding one more lock to security code