Merge "lib: Changes to avoid warnings during compilation"