Updating: removing some compilation warnings