Fix some weird scoping/import issue