More FB fixes