Fixes for wi-fi and other