adjust to latest fosuserbundle changes
adjust to latest doctrine changes