MKN: Redo spoofing and socket leak fixes on new package