Small Integration Tweaks