Resolve issues with services creation

Change-Id: I1a3a754e17de0e833930a122422c58e550854b23