[pvr] some fixes and cleanups after window rewrite

see commit messages.

@Jalle19 or @opdenkamp mind taking a look