COMP: Fix up Boost variables yet again