Fixing data checks;