Pushing final nits