[-] FO: Fix some bugs