Some more minor changes.

Hoping this doesn't break the build.