fix a few lingering issues