Add support for Wpa81
fixup paths