s4:samdb/tools - That should fix now the last failures