More ident fixes