Cleanup a few loose ends