Small updates on FB functions