[FIX] Fixed some minor errors