diff --git a/nvim/lua/plugins/lspconfig.lua b/nvim/lua/plugins/lspconfig.lua
index 1dc7a25..87c8d2b 100755
--- a/nvim/lua/plugins/lspconfig.lua
+++ b/nvim/lua/plugins/lspconfig.lua
@@ -28,7 +28,7 @@ return {
             keymap.set("n", "gR", "<cmd>Telescope lsp_references<CR>", opts)
 
             opts.desc = "Go to declaration"
-            keymap.set("n", "gD", vim.lsp.buf.declaration, opts)
+            keymap.set("n", "gD", ":lua vim.lsp.buf.declaration", opts)
 
             opts.desc = "Show LSP definitions"
             keymap.set("n", "gd", "<cmd>Telescope lsp_definitions<CR>", opts)
@@ -52,7 +52,7 @@ return {
             keymap.set("n", "ga", "<cmd>Telescope diagnostics bufnr=0<CR>", opts)
 
             opts.desc = "Show line diagnostics"
-            keymap.set("n", "gA", vim.diagnostic.open_float, opts)
+            keymap.set("n", "gA", ":lua vim.diagnostic.open_float()<CR>", opts)
 
             opts.desc = "Go to previous diagnostic"
             keymap.set("n", "[d", vim.diagnostic.goto_prev, opts)
@@ -133,6 +133,8 @@ return {
         })
 
         local java_on_attach = function(client, bufnr)
+            on_attach(client, bufnr)
+
             opts.buffer = bufnr
             -- Keybinds for testing, refactoring, java specific
             opts.desc = "Java profiling"