fixes for window and browser class