Fixed compilation warnings for rebuild storage.