Merge "libgui/SF: Fix some code warnings"