Fixing some api.window brokenness.