Fix Zooming and windowing issues