[FIX] some fixes