Update for API changes

SpoutAPI: https://github.com/SpoutDev/SpoutAPI/pull/563
Vanilla: https://github.com/Vanilla/Vanilla/pull/629

This is also a merge pull.