Fix possible size issues.