Fixed issues for invalid ident