Minor changes in arguments