WIP: NetBIOS fix

 - is this enough? (needs more testing)