Some service dependencies fixes.
Replacing HBBA config dependency check with a slightly faster script.