Fixed up some uniform checks in 'program'