Few type changes.