final fixes (hopefully) for external unsubs