Replace \t, various fixes