namespace issues and meta file cleanup