[FIX] minor fixes