Fixes for source sdk build
5 files changed