Fix a memory corruption an remove some strcat
Fix w32 build