More FBL changes