Some finish clean-up