Fix duplicate EXPORT_* CMake variables
Updates submodules