PR fixes
Compilation fixes