Additional changes to wifi setup