[FIX] Fixed minor issues.