Programs: Minor bug fixes