[x] Fixing compilation errors