Fixing some validation error