Fix issue with :fixup where crucial keys were omitted