Fix uWindow
Fixes #403