Fixed last compilation errors