misc changes to bring in line with MonsterWM