Minor changes in getting infos