Minor changes to basic programs