Fixes for ZEN-7882 total file