Vista local jon

Two unrelated commits. See commit messages.