Fix idents, change message