[FIX] Some optimizations