More i3wm fixes