Clean fix to wiisockets based on PR comments