Adding missing args to all calls to validate