Fixing issues related to the new Spire interface.