Fixing compilation errors
Merge pull request #680 from bhariharan/unstable

Fixing compilation errors
Merge branch 'unstable' into smart_sync_sample