Minor fixes in Program