Improved old window handling, depreciation warning suppression