Fixes two more entity packages.