Couple more g_memdup() -> g_memdup2() fixes