Merge in MJ5 wifi driver
A couple fixups