Adds missing type casts