diff --git a/hipamd/CMakeLists.txt b/hipamd/CMakeLists.txt
index 3348056faf..0c209b8fa2 100644
--- a/hipamd/CMakeLists.txt
+++ b/hipamd/CMakeLists.txt
@@ -41,6 +41,7 @@ target_link_libraries(hipify
   clangToolingCore
   clangRewrite
   clangBasic
+  LLVMProfileData
   LLVMSupport
   LLVMMCParser
   LLVMMC
diff --git a/hipamd/src/Cuda2Hip.cpp b/hipamd/src/Cuda2Hip.cpp
index f27a1bc1e5..f2a18262a9 100644
--- a/hipamd/src/Cuda2Hip.cpp
+++ b/hipamd/src/Cuda2Hip.cpp
@@ -613,7 +613,7 @@ int main(int argc, const char **argv) {
   std::vector<std::string> fileSources = OptionsParser.getSourcePathList();
   if (dst.empty()) {
     dst = fileSources[0];
-    size_t pos = dst.find(".cu");
+    size_t pos = dst.rfind(".cu");
     if (pos != std::string::npos) {
       dst = dst.substr(0, pos) + ".hip.cu";
     } else {
@@ -658,7 +658,7 @@ int main(int argc, const char **argv) {
     Tool.appendArgumentsAdjuster(getClangSyntaxOnlyAdjuster());
     Result = Tool.run(action.get());
 
-	  Tool.clearArgumentsAdjusters();
+    Tool.clearArgumentsAdjusters();
   }
 
   LangOptions DefaultLangOptions;
@@ -682,13 +682,10 @@ int main(int argc, const char **argv) {
 
   Result = Rewrite.overwriteChangedFiles();
 
-
+  size_t pos = dst.rfind(".cu");
+  if (pos != std::string::npos)
   {
-	  size_t pos = dst.find(".cu");
-	  if (pos != std::string::npos)
-	  {
-		  rename(dst.c_str(), dst.substr(0, pos).c_str());
-	  }
+    rename(dst.c_str(), dst.substr(0, pos).c_str());
   }
   return Result;
 }