diff --git a/xmonad-session-rc b/xmonad-session-rc
index b367e6b..ee12d4c 100644
--- a/xmonad-session-rc
+++ b/xmonad-session-rc
@@ -16,6 +16,9 @@ gnome-power-manager&
 # Fix for java applications
 export _JAVA_AWT_WM_NONREPARENTING=1
 
+# Fix for openoffice
+export OOO_FORCE_DESKTOP=gnome
+
 # Auto-start applications
 bash ~/.xmonad/battery-monitor.sh&
 gajim&
diff --git a/xmonad.hs b/xmonad.hs
index fb88420..532e4a4 100644
--- a/xmonad.hs
+++ b/xmonad.hs
@@ -3,6 +3,7 @@ import XMonad.Actions.CycleWS
 import XMonad.Hooks.DynamicLog
 import XMonad.Hooks.ManageDocks
 import XMonad.Hooks.ManageHelpers
+import XMonad.Hooks.SetWMName
 import XMonad.Util.Run(spawnPipe)
 import XMonad.Util.EZConfig
 import XMonad.Util.Scratchpad
@@ -24,6 +25,7 @@ import qualified Data.List as L
 
 baseConfig = desktopConfig
     { modMask = mod5Mask -- AltGr
+    , startupHook = startupHook desktopConfig >> setWMName "LG3D"
     , terminal = "mate-terminal.wrapper"
     , workspaces = ["1:web", "2:com", "3:dev"] ++ map show [4..7] ++ ["8:media", "9:div"]
     , layoutHook = smartBorders $ fullscreenFull $ avoidStruts $ boringWindows $ minimize $ maximize $ onWorkspace "8:media" Full $ onWorkspaces ["2:com", "9:div"] simpleTabbed $ (Tall 1 0.03 0.5 ||| Full ||| simpleTabbed )
@@ -49,6 +51,7 @@ workspaceManageHook = composeAll [
     ,className =? "jetbrains-phpstorm" --> doShift "3:dev"
     ,className =? "jetbrains-pycharm" --> doShift "3:dev"
     ,className =? "jetbrains-clion" --> doShift "3:dev"
+    ,className =? "MATLAB R2016b - academic use" --> doShift "3:dev"
     ,className =? "qtcreator" --> doShift "3:dev"
     ,className =? "KeePass2" --> doShift "9:div"
     ,className =? "Xmessage" --> doFloat