Minor changes in function definitions