Added a few fixes to FIN and disconnect