common: Fix warning and build failures
3 files changed