Fix scoping problems