device svc fixes and couple samples