Fix ident and add service check