[s369] Compilation fixes
Compilation fixes