P4: Minor changes.