Fix issues with faceboon