[FIX] Minor fixes