Fixing some stragglers.