[AI-489] Compilation error fixes