tweaks (continuing to move towards Fusepool integration)