Changes done in order to remove compilation warnings