Toolchain Warnings Fixes