Wireless fixes, small fixes to all