some other fixes
BZ-1577 #comment changes to support service (admin client)