Minor fixes
@ben
Submitted by Ben Link to original bug (#764117)
Description
Created attachment 324647 fix compiler warnings
Fix some compiler warnings and a gir annotation
Patch 324647, "fix compiler warnings":
0001-Fix-compiler-warnings.patch