Programs: Minor improvements