Some services reorderings, fixes

Change-Id: I6cf036c844a62dccd7e2e49748c924fc0b43faea