Updating: eliminating some compilation warnings