Router property scoping fixes