A couple more fixes to LocationComponent