Fix bug on giving wrong argument to Window
Fix regression on mappings timeout