fixed compilation errors of last changes