Fix finishing behaviour
Review comments.