More FBL fixes