Additional fixes for data types in warnings.