Bunch of followup fixes on fbUserId retrieval