Fixed window issues