Merge "Fix sizeof warnings on calloc"