[*] Some fixes (doesn't work)