WifiFinder fixes