[FIX] Some fixes