More fixes to xmonad.hs