Fixes

Fixed a coupel of issues that were casued by empty data files