[FIX] various fixes