Fix for a few loose ends.