Attempt to fix build

Builds now, but need to test live...