Merge "target/platform: Fix compilation warnings"