Minor changes in function outputs.