[WIP][TASK] Fix PackageStates failures