Fix compiler error + smaller fixes

The first commit fixes an error that popped up after a recent Rust upgrade. The other two commits fix some smaller issues.

All of this is pretty trivial, so I guess it should be ok to bunch it all together into the same PR.