Fix Window Errors

(1)