Finish fixes #4