Fix that some codes have wrong data type
Fix throttling
Remove dependency that is already included elsewhere