Minor changes in types of variables