FW: Fix recents errors