Fixes for my window helpers.