Fix LocationSelector2 and a couple of fixes highlighted by Graeme's smoke
tests