More FB Fixes