Add checks for window-system