Programs: Minor improvements

Fix run once bug as well