Various supplicant parsing updates