[FIX] Fixed small things.