Updated target platform and fixes for namespace refactoring