Fixed some window metrics