Fix a few variable size array issues.