Partially fix id detection and remove no lightning fix for now