Minor changes in shell functions