Small changes to synchronize with the patches branch
Add missing initialization