Add missing imports and @globals