Fix FB sdk issues