Merge "Fix libgui warnings"