Nouveau warning fixes

Here's a couple of fixes for some warnings that popped up in some CI logs.

The latter fix is arguably more than just a warning-fix, but it's not perfect as-is either.