Fix on services requests graph
Fix on errors after migration cleanup