[FIX] minor bugs