Fixes for win and tabs